Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release_3_9] Attribute table - Fix some misbehaviours #5101

Merged
merged 1 commit into from
Dec 10, 2024
Merged

[Backport release_3_9] Attribute table - Fix some misbehaviours #5101

merged 1 commit into from
Dec 10, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Dec 10, 2024

Backport #5100
Authored by: @mdouchin

@rldhont rldhont requested a review from mdouchin December 10, 2024 09:32
@github-actions github-actions bot added this to the 3.9.0 milestone Dec 10, 2024
@github-actions github-actions bot added javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not attribute table labels Dec 10, 2024
@rldhont rldhont changed the title [Backport release_3_9] Attribute table - Fix bugs [Backport release_3_9] Attribute table - Fix some misbehaviours Dec 10, 2024
@rldhont rldhont added backport release_3_7 backport release_3_8 run end2end If the PR must run end2end tests or not and removed run end2end If the PR must run end2end tests or not labels Dec 10, 2024
@rldhont rldhont merged commit dcb33bd into 3liz:release_3_9 Dec 10, 2024
15 of 16 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr 
error: could not apply e7165626b... Attribute table - Fix bugs
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
stdout 
Auto-merging assets/src/legacy/attributeTable.js
CONFLICT (content): Merge conflict in assets/src/legacy/attributeTable.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5101-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e7165626bd5d28db90b68db04752826cfaa1c93e
# Push it to GitHub
git push --set-upstream origin backport-5101-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

Then, create a pull request where the base branch is release_3_7 and the compare/head branch is backport-5101-to-release_3_7.

@3liz-bot 3liz-bot mentioned this pull request Dec 10, 2024
Merged
@rldhont rldhont mentioned this pull request Dec 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdouchin mdouchin Awaiting requested review from mdouchin

Assignees
No one assigned
Labels
attribute table backport release_3_7 backport release_3_8 failed backport javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not
Projects
None yet
Milestone
3.9.0
Development

Successfully merging this pull request may close these issues.
3 participants
@rldhont @3liz-bot @mdouchin